diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html
index 77c080c..c87c24b 100644
--- a/user_guide/general/credits.html
+++ b/user_guide/general/credits.html
@@ -63,7 +63,7 @@
 <h1>Credits</h1>
 
 <p>Code Igniter was developed by <a href="http://www.ellislab.com">Rick Ellis</a>, who in his other life is CEO of
-<a href="http://www.pmachine.com">pMachine, Inc.</a>  The core framework was written
+<a href="http://ellislab.com/">Ellislab, Inc.</a>  The core framework was written
 specifically for this application, while many of the class libraries, helpers, and sub-systems borrow from the code-base of
 <a href="http://www.pmachine.com/ee/">ExpressionEngine</a>, a Content Management System written by Rick Ellis and
 <a href="http://www.reedmaniac.com">Paul Burdick</a>.</p>
@@ -89,7 +89,7 @@
 Next Topic:&nbsp;&nbsp;<a href="../installation/downloads.html">Downloading Code Igniter</a>
 <p>
 
-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
+<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
 </div>
 
 </body>